Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DO NOT MERGE] Backport ETag improvements and bug fixes from master to ozone-1.4 #6557

Merged
merged 5 commits into from
Apr 23, 2024

Conversation

ivandika3
Copy link
Contributor

What changes were proposed in this pull request?

Backport the following ETag patches to ozone.1.4 for 1.4.1 release:

HDDS-9680. Use md5 hash of multipart object part's content as ETag (#5668)
HDDS-10395. Fix eTag compatibility issues during MPU (#6235)
HDDS-10403. CopyObject should set ETag based on the key content (#6251)
HDDS-10521. ETag field should not be returned during GetObject if the key does not contain ETag field (#6377)
HDDS-10587. Reset the thread-local MessageDigest instance during exception (#6435)

How was this patch tested?

https://github.com/ivandika3/ozone/actions/runs/8739462351

@ivandika3 ivandika3 self-assigned this Apr 19, 2024
@ivandika3
Copy link
Contributor Author

ivandika3 commented Apr 19, 2024

@vtutrinov Could you help to check whether the ETag patches are correctly cherry-picked (especially HDDS-9680)?

@ivandika3
Copy link
Contributor Author

cc: @xichen01

@ivandika3
Copy link
Contributor Author

ivandika3 commented Apr 19, 2024

@adoroszlai I was hoping to add the ETag fix in #6519, but that might mean to exclude the s3a-test.sh during backport since it does not exist in ozone-1.4 branch yet. Do you think we should include this in this backport or a separate S3A compatibility backport?

@adoroszlai
Copy link
Contributor

Thanks @ivandika3 for working on this.

Do you think we should include this in this backport or a separate S3A compatibility backport?

It can be included in a later PR. BTW, I just noticed a minor bug (HDDS-10719) introduced by HDDS-10615.

@ivandika3 ivandika3 requested a review from xichen01 April 22, 2024 05:17
@vtutrinov
Copy link
Contributor

@vtutrinov Could you help to check whether the ETag patches are correctly cherry-picked (especially HDDS-9680)?

@ivandika3 thanks for the backport, LGTM, +1

@ivandika3 ivandika3 merged commit fc28224 into apache:ozone-1.4 Apr 23, 2024
33 of 34 checks passed
@ivandika3
Copy link
Contributor Author

ivandika3 commented Apr 23, 2024

Thank you for the reviews @vtutrinov and @adoroszlai.

Merged using:

git checkout ozone-1.4
git pull
git merge --ff-only ozone-1.4-etag-backport
git push

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants